Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More ptp2 event logging improvements #1034

Merged
merged 4 commits into from
Oct 1, 2024
Merged

Conversation

axxel
Copy link
Contributor

@axxel axxel commented Sep 30, 2024

No description provided.

Properly count the number of events, such that amount allocated fits with
amount required. Warn if a mismatch happens.
This shall help with comparing the event log with USB packet traces. Also
tune the layout to accommodate the new info.

example log:

event 635:c18a: prop d175 options changed, type 3, count  1 (EOS_NetworkCommunicationMode)
                prop d175 option[ 0] == 0x00
event 636:c18a: prop d244 options changed, type 3, count  3 ((null)) (unknown)
event 637:c1a4: CTGInfoCheckComplete 0x00020001
event 638:c19d: unhandled EOS event PowerZoomInfoChanged (size 12)
         0x000:  -  -  -  -
event 639:c1a5: OLCInfoChanged (size 100, version 0x14, mask 0x1fff)
         0x000: 60  -  -  - ff 1f  -  - 01  - 01 01  - a0  - 10
         0x010:  - 68  - 01 03  - 50  - 20  - 38  - 01 01  -  -
         0x020: 78 28  - 04 01 06 41  -  -  -  -  -  - 01 01  -
         0x030:  -  -  -  -  -  -  - 01  -  -  -  -  -  -  -  -
         0x040:  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -
         0x050:  -  -  -  -  -  -  -  -  -  -  -  -
event 639:0001: (olcmask) 2 bytes: 01 00
event 640:0002: (olcmask) 9 bytes: 01 01 00 a0 00 10 00 68 00
event 641:0004: (olcmask) 9 bytes: 01 03 00 50 00 20 00 38 00
event 642:0008: (olcmask) 7 bytes: 01 01 00 00 78 28 00
camlibs/ptp2/ptp-pack.c Dismissed Show dismissed Hide dismissed
@msmeissn msmeissn merged commit cedc250 into gphoto:master Oct 1, 2024
5 checks passed
@axxel axxel deleted the more-ptp2 branch October 1, 2024 07:51
@msmeissn
Copy link
Contributor

msmeissn commented Oct 1, 2024

(added commit 8b8c81c after afl showed new crashes)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants